fix: ignore closed log streams during shutdown#2222
Closed
lavish0000 wants to merge 1 commit intomodelcontextprotocol:mainfrom
Closed
fix: ignore closed log streams during shutdown#2222lavish0000 wants to merge 1 commit intomodelcontextprotocol:mainfrom
lavish0000 wants to merge 1 commit intomodelcontextprotocol:mainfrom
Conversation
9 tasks
Contributor
|
Thanks for the PR! Per our CONTRIBUTING.md, PRs require a corresponding issue with the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
ClosedResourceErrorandBrokenResourceErrorfromsend_log_message()Problem
When the server receives an exception from the stream during shutdown,
_handle_message()tries to emit an internal error log notification throughsession.send_log_message(). If the session write stream has already been torn down, that best-effort log write can raiseClosedResourceErrororBrokenResourceErrorand crash the enclosing task group.Fix
Treat exception logging in this shutdown path as best-effort. If the write stream is already gone, skip the log notification and continue handling the original shutdown flow.
Validation
uv run pytest tests/server/test_lowlevel_exception_handling.pyuv run ruff check src/mcp/server/lowlevel/server.py tests/server/test_lowlevel_exception_handling.pyuv run ruff format --check src/mcp/server/lowlevel/server.py tests/server/test_lowlevel_exception_handling.pyuv run pyright src/mcp/server/lowlevel/server.py tests/server/test_lowlevel_exception_handling.py